Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix git hell #47

Merged
merged 17 commits into from
Oct 18, 2023
Merged

Fix git hell #47

merged 17 commits into from
Oct 18, 2023

Conversation

gretzke
Copy link
Contributor

@gretzke gretzke commented Oct 18, 2023

Because I accidentally merged a PR into main, then reverted it and merged it into dev, it messes up the staging merge into main, because I either need to merge main into staging or rebase staging on top of main. Both revert the functionality in staging. So now I squashed two commits so that it's no longer affected if I rebase staging on top of main

DhairyaSethi and others added 17 commits October 18, 2023 16:32
* feat: md generation

* only ignore devnet broadcast files

* fix: generateDeploymentHistory

* upd: goerli deployment json + md

* fix: etherscan link

* fix: commit hash of deployment

* fix: include latest in deployment history

* chore: rm module exports

* chore: uppercase i, fix table of contents

* update paths, add 1.1.0 upgrade script

* chore: mv json to deployments/json/

* new: use deployment input

* chore: use {version}/input.json

* chore: ignore devnet json

* fix: support for upgrade scripts json

* chore: fs_perms for input.json

* fix: md gen

* fix: etherscan link edge case

* new: add version column in summary

* chore: deployment history versions in summary

* chore: fix history

* new: update json structure - rm lastest.contracts, add first version to history

* chore: update json/md with new structure

* chore: update usage, validate inputs, add help cmd

* new: extract commitHash, timestamp in parent obj in history

* fix: add 1.0.0 to history on init

* chore: add line break bw contracts

* new: use UTC timestamp

* chore: rm history before implementation history, GMT->UTC

* Update existing deployment logs to new format

---------

Co-authored-by: gretzke <[email protected]>
feat: add ecosystemFund
feat: mint to ecosystem fund
upd: emissionRate to 1.03
upd: emissionManager version -> 1.1.0
wip: update emission manager tests
fix tests
docs
fix distribution
adjust m1ntCap

move natspec to interfaces
@gretzke gretzke changed the base branch from main to staging October 18, 2023 14:36
@gretzke gretzke requested a review from simonDos October 18, 2023 14:38
@gretzke gretzke merged commit 7777c1d into staging Oct 18, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants